From 991eaa7580812d1b26e62382f6201dcdfd0b16d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Tue, 17 Aug 2010 15:13:33 +0200 Subject: [PATCH] gtk/gtklabel.c: Use accessor functions to access GtkWindow --- gtk/gtklabel.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 4ac34208b5..94ac98a036 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -6398,17 +6398,22 @@ gtk_label_activate_current_link (GtkLabel *label) { GtkWidget *toplevel; GtkWindow *window; + GtkWidget *default_widget, *focus_widget; toplevel = gtk_widget_get_toplevel (widget); if (GTK_IS_WINDOW (toplevel)) { window = GTK_WINDOW (toplevel); - if (window && - window->default_widget != widget && - !(widget == window->focus_widget && - (!window->default_widget || !gtk_widget_is_sensitive (window->default_widget)))) - gtk_window_activate_default (window); + if (window) + { + default_widget = gtk_window_get_default_widget (window); + focus_widget = gtk_window_get_focus (window); + + if (default_widget != widget && + !(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget)))) + gtk_window_activate_default (window); + } } } } -- 2.30.2